radicale3: tweak Makefile and initscript

* fix service_reload in initscript so it reloads configuration
* fold long lines for readability
* shellcheck is a useful linter, if a bit pedantic, so use it and
  update script to address its warnings.

Signed-off-by: Daniel F. Dickinson <dfdpublic@wildtechgarden.ca>

diff --git a/net/radicale3/Makefile b/net/radicale3/Makefile
index 1db52b1262b55b4147c31ca720098b2839962135..7b4b2d81d25e642e17075f177d0acf3be7901770 100644 (file)
--- a/net/radicale3/Makefile
+++ b/net/radicale3/Makefile
@@ -1,11 +1,14 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 
+# cspell:words TOPDIR PYPI Radicale conffiles dateutil defusedxml passlib
+# cspell:words setuptools vobject
+
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=radicale3
 PKG_VERSION:=3.5.10
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_LICENSE_FILES:=COPYING.md
@@ -26,13 +29,20 @@ define Package/radicale3
   URL:=https://radicale.org/
   TITLE:=Radicale 3.x CalDAV/CardDAV server
   USERID:=radicale3=226:radicale3=226
-  DEPENDS:=+python3 +python3-dateutil +python3-vobject +python3-setuptools +python3-defusedxml +python3-passlib +python3-requests +python3-pika
+  DEPENDS:=+python3 +python3-dateutil +python3-vobject +python3-setuptools \
+    +python3-defusedxml +python3-passlib +python3-requests +python3-pika
   PROVIDES:=radicale radicale2
 endef
 
 define Package/radicale3/description
-  The Radicale Project is a CalDAV (calendar) and CardDAV (contact) server. It aims to be a light solution, easy to use, easy to install, easy to configure. As a consequence, it requires few software dependencies and is pre-configured to work out-of-the-box.
-  The Radicale Project runs on most of the UNIX-like platforms (Linux, BSD, MacOS X) and Windows. It is known to work with Evolution, Lightning, iPhone and Android clients. It is free and open-source software, released under GPL version 3.
+  The Radicale Project is a CalDAV (calendar) and CardDAV (contact) server.
+  It aims to be a light solution, easy to use, easy to install, easy to
+  configure. As a consequence, it requires few software dependencies and is
+  pre-configured to work out-of-the-box.
+  The Radicale Project runs on most of the UNIX-like platforms
+  (Linux, BSD, MacOS X) and Windows. It is known to work with Evolution,
+  Lightning, iPhone and Android clients. It is free and open-source software,
+  released under GPL version 3.
 
   This package contains the python files.
 endef

diff --git a/net/radicale3/files/radicale3.init b/net/radicale3/files/radicale3.init
index 1afc25f26cde0f117e08dbacf32d30e7afec1b09..eb78f8bf9dd0dc6822c75d85361f05a6d38a5d73 100755 (executable)
--- a/net/radicale3/files/radicale3.init
+++ b/net/radicale3/files/radicale3.init
@@ -1,5 +1,9 @@
 #!/bin/sh /etc/rc.common
+# shellcheck shell=ash
+# cspell:words CFGDIR SYSCFG USRCFG cfgfile chgrp defval getline hostlist
+# cspell:words htpasswd radicale tmpconf tmpusers
 
+# shellcheck disable=SC2034
 START=99
 USE_PROCD=1
 
@@ -168,8 +172,11 @@ build_users() {
 }
 
 build_config() {
-       local tmpconf=$(mktemp)
-       local tmpusers=$(mktemp)
+       local tmpconf
+       local tmpusers
+
+       tmpconf=$(mktemp)
+       tmpusers=$(mktemp)
 
        chmod 0640 "$tmpconf" "$tmpusers"
 
@@ -216,6 +223,11 @@ start_service() {
        procd_close_instance
 }
 
+reload_service() {
+       stop
+       start
+}
+
 service_triggers() {
        procd_add_reload_trigger "radicale3"
 }